Manual merge.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 10 Jul 2005 17:32:01 +0000 (17:32 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 10 Jul 2005 17:32:01 +0000 (17:32 +0000)

Trivial merge